Merge from origin/emacs-25

4179238 Improve documentation of 'w32-scroll-lock-modifier'

diff --cc doc/emacs/msdos.texi
Simple merge

diff --cc src/w32fns.c
Simple merge